This reverts commit 1c29b0e6. Reason for revert: Broke aosp_x86_64 Change-Id: I581200f1c271c3e1a39d5cdad84c782977b13054