Merge "Add a "reverse AUX hack" for ARM."