Merge "ANativeWindow_toSurface implementation" into oc-dev