Unfreeze ndk/current

Test: make
Bug: 319323819
Change-Id: Ied2099f8be2396dcd131a2248f3ace9db8a322da
Merged-In: Ied2099f8be2396dcd131a2248f3ace9db8a322da
(cherry picked from commit 3b1a0abf857610ce551129af13b42d5b7b8cfb79)
48 files changed