Merge "Don't use cutils/Atomic.h"