Merge changes Iad7bf035,I870e08c6

* changes:
  VNDK ANativeWindow API - step 2
  VNDK ANativeWindow API