This reverts commit 5400741601.
Reason for revert: broke hidl build
Change-Id: I3954a1c0d6c0d7a663bd2a1c8c8888cae37cee80
This reverts commit 5400741601.
Reason for revert: broke hidl build
Change-Id: I3954a1c0d6c0d7a663bd2a1c8c8888cae37cee80