Merge "Increase droiddoc -J-Xmx to 1600MB."
am: 01f49a3d5e

* commit '01f49a3d5e5d8f4fdd83d1b74a230f8160aabe08':
  Increase droiddoc -J-Xmx to 1600MB.