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

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