am c9dcc577: am e50dffa2: Merge "Remove transitive dependency on <cutils/atomic.h>."

* commit 'c9dcc5775fe0cb23634df9f1e191b7f45de4de07':
  Remove transitive dependency on <cutils/atomic.h>.