Merge "Merge "Don't use cutils/Atomic.h" am: 07735797a2 am: a272d540d8 am: 0f4ca4a5c0"