Android O MR1 IOT Release Smart Display r40.1J (OIMK.211005.001)
Merge "Switch from add_lunch_combo to COMMON_LUNCH_CHOICES" am: 152ea797fd
am: f2d082c586

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