am a3f16f22: Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."

* commit 'a3f16f22dc9f68ae0a204cfb9159270a3291231f':
  Add LOCAL_MULTILIB := both to Darwin libbacktrace.