Android 10.0.0 release 21
Merge "Add an NDK library variant"