Merge "Make dex2oat heap size product configurable [build]"