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

Change-Id: Ibfc7ddbb44f50e78aceab07648489ac1499d57ab