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

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

Change-Id: I447255900e346d051a270c16019c7b1b3c931139