Merge "libstagefrighthw: Fix CFI issue for wma/ape playback"