Merge "More android.media.AudioFormat javadoc" into mnc-dev