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

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