Merge "libstagefright doesn't need libFLAC" am: a870fb0afa am: 625149dd57 am: 086ccfd4ac
am: 3aed5c9e77

Change-Id: Ic26cc60476fa03f9b82344c75bac81bab95ce644