Android O MR1 IOT Release Smart Display r9 (OIM6.190107.030.A1)
Merge "Inline contents of core_base.mk in mini_common.mk" am: ee034bd356
am: 98c1add8d0

Change-Id: I7f33e9934066f2babd08a67667b3f70742c13401