am 4b9f899b: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."

* commit '4b9f899bf1f5d09622307df85ba7d7f7aabbb834':
  Add comment to discourage use of cutils/atomic.h.