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

Change-Id: I9461e0baeb134df993a6cc72fcec4411ff1210e5