am b07d7f6c: Merge "Update NDK headers"

* commit 'b07d7f6c25fe3ea99186c2cdb034449e75419518':
  Update NDK headers