Merge commit '722665c5f76e81bed646490977ea30f38aaa00da' * commit '722665c5f76e81bed646490977ea30f38aaa00da': fix build. SurfaceView.setFrame needed to be hidden
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da' * commit '722665c5f76e81bed646490977ea30f38aaa00da': fix build. SurfaceView.setFrame needed to be hidden