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

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