Revert "aosp hardware 3"

This reverts commit ca544f695d672da0e1e32b2a67448f6f60667d68.
Revert "aosp hardware"

This reverts commit fe848c8745b5f7e85dc1801d0abad369eaaa1733.
Revert "aosp hardware"

This reverts commit e8c24368718beb81d5a34dea011fedf30a4aca5e.