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

Change-Id: If9b9eaa24750f1e72a9123d7bfb553669c39f94c