am 7afd3a56: am 028c4032: Merge "Update NDK with recent changes." into gingerbread

Merge commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2'

* commit '7afd3a56c5801f4d30633c75b0aa7c148a562cf2':
  Update NDK with recent changes.