Merge "Update NDK prebuilts to build 8474149. am: ee71351fae am: 8ce995d7e8" into tm-d1-dev-plus-aosp