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

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