This reverts commit 81141ac9. Reason for revert: breaks linux-bionic targets Test: none Bug: 122373634 Change-Id: I95300f3c73a6c102abe5c0f66c5a8deed52cfd12