am 3b54d5a5: am a5b55c27: Merge "Add a "reverse AUX hack" for ARM."

* commit '3b54d5a5fc492de5b28d905d0be36be66acec791':
  Add a "reverse AUX hack" for ARM.