Merge "update native_window.h ndk header" into gingerbread