Merge "Clean up uses-native-library targetSdkVersion check" into sc-dev