Revert "Fix VM-less builds."

This reverts commit 62753c474b83546f5f40ca114530a3f377a51bbc.

Bug: 18465297
Change-Id: I800198949e3837f8dab3ad966aeb7dac5d7911c0
1 file changed