Use COMMON_LUNCH_CHOICES instead of add_lunch_combo as per guidelines

Use COMMON_LUNCH_CHOICES instead of add_lunch_combo
in respective AndroidProducts.mk files.

Change-Id: I55a7373614d8641caaf817dc24c2ad669d316efa
2 files changed