Revert "Track CM's frameworks_opt_hardware"

This reverts commit fd8c1803c059ddd2167a8f8a3c9b2112272f4a66.

Change-Id: Ib1d8d62b0e575277a779738b9820156e1a3fc112
Merge "Revert "Track CM's frameworks_opt_hardware"" into du44