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

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

Change-Id: Ia4205030c07494149b8392abf74ec29ebd463724