Merge "Fix warnings in cutils/atomic.h" am: 5e093f367c am: 6f292bcab9 am: a205ed0aad
am: 3b7524fe3a

Change-Id: I3e3ad863658826141886b4e6eae538297b84dd5c