Revert "Revert "Track CM's frameworks_opt_hardware""

This reverts commit be3598c634bda4fdf86b1b4ebfe732563110d000.

Change-Id: I4cc67715f8f3bc67674782f08b9e363ee0e8ac8e