Merge "libstagefright doesn't need libFLAC"