Merge "libstagefright doesn't need libFLAC"
am: a870fb0afa

Change-Id: I73b01b8906a4bf766987e997ea71ada8d5d5d815