Merge "Remove temporary javadoc for android.media.AudioFormat" into mnc-dev