Merge "Revert "Remove a compat hack SurfaceView#setWindowType()"" into oc-mr1-dev am: a729236399
am: b0b685bab7

Change-Id: I3a5278b423544fc1f64f4c3424ea67899d4d5975