Merge "Disable detection of MP3 audio contained in MPEG1" am: d9272a936e am: 8e1e78ebb9
am: a774d5f64c  -s ours

Change-Id: Ic5cf99e73d4de2f2adbfafdcaf039171af8eac7b