This reverts commit 36703dc2. Bug: 120436895 Reason for revert: Breaks x86 only build. Change-Id: Ifd5b561eeffcd721174f5eb591c6bad66dff8de8