am 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev...
am 847e02cb: am 3c1da3e2: (-s ours) DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table
* commit '847e02cb':
DO NOT MERGE cherrypick from jb-mr2-ub-dev docs: small fix for NDK download table