Merge "libstagefright: Add WFD specific flags to consumer usage flags"