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

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