This reverts commit 6fe8721e. Reason for revert: Broke aosp_kernel-build-tools/linux Change-Id: I502ec4c275cbc56e1024a42fadf68b308750939d