Merge "Remove obsolete TARGET_AUX_OS_VARIANT_LIST" am: 165a7089ec

Change-Id: If545c2542ac8320f6166c60125b584c0418b856e