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