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

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