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

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