Merge "StageFright: Set input surface default format"