Merge "Framework-side of SurfaceView#getBitmap" into nyc-dev