Revert to CM libhardware

Change-Id: Ie1e9f4bec4e844c8c2376fd7d822b2dd71c229f9