Merge "Introduce uses-native-library tag"