am fc187b1e: Merge "update native_window.h ndk header" into gingerbread

* commit 'fc187b1e3a73275dba91e98d912aa23d7b097fc9':
  update native_window.h ndk header