Merge "Remove code for seamlessly rotating SurfaceView's." into oc-dev
am: 2b33162e82

Change-Id: I890ce8db592a6bcebbefe05f922e0170ba23d109