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

Change-Id: I260748eb436c4540c19b89c8184870600b7841dc