Merge "more AudioAttributes javadoc" into lmp-dev