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

Change-Id: Id5eefe7a9b4b0e3ac20dc7e5f53139fda63cd0f9