am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
  Switch ARM back to libcorkscrew temporarily.