Rvert "Track display/media-caf-7x30"

CM has merged the pending msm7x27a/30 patches

This reverts commit 34f1ff70ac5d3414529b51f27a6a26b05e507410.