am a6399035: Fix and re-enable CMS

* commit 'a6399035ee2af012e2ac898ee7a753a2f83b35ab':
  Fix and re-enable CMS
tree: 925096d35769e733703ebd1e5cd728d17c8bea01
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk