Merge "Increase javac heap to 4096M" am: ef425ee163 am: 1225b4ab9c am: 5d20a1f706

Original change: https://android-review.googlesource.com/c/platform/build/+/2217241

Change-Id: I668744673c0f724a6e70f223b5515806223a0e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>