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

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