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

Change-Id: I35b9aa813c4140cc273272421a05df22b69aeb2e