Add AndroidProducts and slight renaming.