am 025f0ad2: am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev

* commit '025f0ad257bd3a8b74bfd1586716a2ff85faca20':
  More android.media.AudioFormat.Builder javadoc