am dae9f5a5: am f3a2430a: am 738fa2f6: Merge "Add dalvik.vm.gctype to enable switching between different GCs."

* commit 'dae9f5a5158257c65fae014b38bde08741b97e62':
  Add dalvik.vm.gctype to enable switching between different GCs.