am 9de6872b: am 1f0003f5: Merge "Unify NDK platform headers." into gingerbread

Merge commit '9de6872b4c0ab35e4466fc05f36e0b9801e06a47'

* commit '9de6872b4c0ab35e4466fc05f36e0b9801e06a47':
  Unify NDK platform headers.