am b53e3cac: am 3c72deb3: Merge "ndk: remove undefined symbols from system headers" into gingerbread

Merge commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d'

* commit 'b53e3cac405a25fb4d7fa267dd41737caa03628d':
  ndk: remove undefined symbols from system headers