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

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

Change-Id: I8f07cac8e93a5d392e8e7bf0eb051888b572b4f0