Merge "Don't use cutils/Atomic.h" am: 9355446812 am: 6867db2980
am: 47d776d277

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