Merge "ndk: remove undefined symbols from system headers" into gingerbread