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