am 99356bda: Merge "Enable / disable CMS runtime options." into ics-mr1-plus-art

* commit '99356bda6dcb9d24596fc015b34681d5202b6441':
  Enable / disable CMS runtime options.
tree: dc9a2a6a082d0277e8c7c02910348d884399b69f
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk