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

Change-Id: I2f402ea2a6003e5306a7bbcf1d7b8d640672d460