Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES"
am: 152ea797fd

Change-Id: I26260647428a95e62c9afef5f3e6e14067e6a622
tree: fe500695e7001a040b25592e8499e616f00ecd3a
  1. AndroidProducts.mk
  2. BoardConfig.mk
  3. mini_emulator_x86.mk