am fb0a19d6: am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds"

* commit 'fb0a19d603b0f2c00ec3491a39d37103496cbca9':
  Add -latomic to all target builds