Add AndroidProducts. Slight renaming.