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

Change-Id: I56073163e643515f490f7274df530b3538d31f21