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

Change-Id: Ie381648e45653be544634f81d9e0ce35d72188b6