Merge "Remove a compat hack SurfaceView#setWindowType()" into oc-mr1-dev am: f678eaad89
am: 5eca35d4a0

Change-Id: I29c7b3125d20ea44b3e9e0f1e1b0aec36fbbfeb2