Revert "Track hardware and qcom stuff from CM"

This reverts commit ab6f99fa5096ab893b6c21e0af69d78f008412b2.

Change-Id: Ibfd1c1910c1d9af590d66ec3eb3c6972ac273ecd