am 33c98d9a: am 59d7372d: Merge "Bump DX Java heap to 2GB."

* commit '33c98d9ab283913b7b76d8a33e138aafe9724d68':
  Bump DX Java heap to 2GB.