Android Mainline 10.0.0 Release 5 (6004948)
Merge "Add an NDK library variant"