This reverts commit 1ec12554. Reason for revert: b/167632665, broke linux_bionic builds. Change-Id: I544fb5fd8aab06efa5618f076af3032271d4020f