Merge commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1' * commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1': Update docs for NDK.
Merge commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1' * commit '5f9be93958c2e8d5105064a6ce080265ce0b8bb1': Update docs for NDK.