Merge "ANativeWindow_toSurface header" into oc-dev