This reverts commit 9a4b17e3e1. Reason of revert: this breaks hidl_test / lshal_test Bug: 65603915 Change-Id: I73427657615ab9c7e3c0c7d336f03510d9a53fe6
9a4b17e3e1