Merge "cherrypick Change-Id: I245fcc37495196b46d1930f74bdb7632fc106af2 docs: update ndk requirements issue 5157542"