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

Change-Id: Ibc4e2f176cd46b6de4cc6f6e6f28e3309a00f1a2