Merge "Remove obsolete TARGET_AUX_OS_VARIANT_LIST" am: 165a7089ec am: 49fe9e8f79 am: 9b2983ce04 am: cb7dfb944a am: e84c0410ea

Change-Id: I16e77051316cc1bc8fee81d8e1b4828033c83ccf