Merge "Remove transitive dependency on <cutils/atomic.h>."