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

Change-Id: I690e4fe17fcbceab3488c40dce2baec9cc97a3e7