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

Change-Id: I60e745f53e8521012120eb8d81b9a32e69eb2229