am 5a3dbcee: am 53c8d061: Merge "ndk: Update platform system libraries." into gingerbread

Merge commit '5a3dbceeb452487ef9328978140c07c4fc596291'

* commit '5a3dbceeb452487ef9328978140c07c4fc596291':
  ndk: Update platform system libraries.