am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]