Merge "Disable detection of MP3 audio contained in MPEG1"
am: d9272a936e

Change-Id: Ibbba982866d9acc18e526e02bdf0893021e61383