This reverts commit 1a95e60b. Reason for revert: Breaks aosp_x86-eng build Change-Id: Ib2a0d835e12023991a6cae429c1fa76d61fa3090