Merge \"Merge \\\"Fix JAVA doc for AudioRecord and AudioTrack Builder\\\" into nyc-dev am: 34ed8ad3c2 am: c5e3f9b539\" into nyc-mr1-dev-plus-aosp
am: 0024958d9a

Change-Id: If92edeaef67d4822345c4b33bf101e89f719e14a