am 4c4160a0: am b0a6241b: am 58d4906b: am 663d7753: am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev

* commit '4c4160a041643072f0bcfbdcfbcc904796dd0a5c':
  NDK r9d: Incorporates all review comments, final file sizes.