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