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

Change-Id: I1a247359c11c0738a15a35a755ed122eb208b73f