Revert "msm7x30: Rename CAF variants to caf-7x30"

CM merged the pending msm7x30 patches \o/

This reverts commit d6aa032d03d9e5d766e93f0d82afa21e1c683cf5.

Change-Id: I7857cfb74a34a9c562c8cc3faed38537c471f03d