Merge "Clean up some mess by only building Android-specific code for the device." am: 443fdb2fdc
am: 0fa7eddc31

Change-Id: Ibf53e71d3a82dca02d76b193b71cf25a0b926e26