Merge "Create native Surface object on updateWindow for legacy apps." into oc-dev am: 1e1c5d7b77
am: 14d9e3a529

Change-Id: I722724da6c83337bd810dc3ebe44d5a65451924c