This reverts commit 83761ed2. Reason for revert: Broke aosp_x86_64-eng checkbuild Change-Id: I692bb634ba5e0b6232a2cd51cc044da3d4856366