Merge "Update UID activity class name" into oc-dev
tree: 14940fb47c1565c4cb14afb97bd9ea10a45162c7
  1. acts/
  2. tools/
  3. Android.mk
  4. PREUPLOAD.cfg