Merge "Revert "Revert "Remove a compat hack SurfaceView#setWindowType()""" into pi-dev
am: 4b306e5e23

Change-Id: I7991370efab6d53c7b299ec86a851018062ed3f4