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

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