Merge "dvr_api GetExternalSurface returns ANativeWindow" into oc-dev