Merge "Increase javac heap to 4096M" am: ef425ee163

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

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