Merge "Add an NDK library variant"