Merge "ANativeWindow_toSurface implementation" into oc-dev
am: 7e5d2c23a4

Change-Id: I43258cd59a653fb6938a96d27579bf48d92a3195