Merge "AudioAttributes: remove JNI warning" into sc-dev