Merge "Increase max heap size of ddms to allow bigger heap dumps."