Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am: ea1f3cb5c3

Change-Id: Ia61b3fd592e19c7fb021b0f22e3eeb8bbc6b5b4f