Minor cleanup of the android build files