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

Change-Id: I3ae6f0662bffd9cf81ae401e80821488cccd3933