Merge "Don't use cutils/Atomic.h"
am: 9355446812

Change-Id: I4dc657debfdbaeecde2d1e5c130af9bcbafc0322
tree: bd0725018d01a52d7b6cc2b5dbfb44e1e4e98320
  1. 6515/
  2. 65xx/
  3. Android.mk