Merge "Increase droiddoc -J-Xmx to 1600MB."