Revert "Track CM frameworks/opt/hardware"

This reverts commit 93a72f12a4805eb0ad5c7b9d6d556587b0433e3b.
Merge "Revert "Track CM frameworks/opt/hardware"" into jb-mr2