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

Change-Id: Ib6e5fd941a3b091274fc5af2428f4a567abb5b69