Merge "<cutils/atomic.h> has been inlined for two years now."
am: c5016de66b

* commit 'c5016de66b6d778dd7c292e215aad6b5c079e92c':
  <cutils/atomic.h> has been inlined for two years now.

Change-Id: Icc28b866c2dd081d1047263c7cfaea05d20975f6