Revert "Workaround issue with android.hardware"
Revert "Workaround issue with android.hardware"

This reverts commit 12a10f6d1b4f33f17d86a79beca3bd852d21fdc9.

The issue is solved by https://android-review.googlesource.com/#/c/95929/.

Change-Id: Id21481aeccd0bc7c6721946eb84889e365047145

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst