Merge "test: Bump dx max heap size for default*gen tests"
am: 46e67be2da

Change-Id: Ibf54d6bf2e5a4ad590a485cf75bc002f3c785515