Android 10.0.0 Release 9 (QD1A.190821.011.C4)
Merge "Add an NDK library variant"