Merge "Revert "Cache Java codegen'd flags in static member variables."" into...

Merge "Revert "Cache Java codegen'd flags in static member variables."" into main am: a06cff10 am: d3a323b1 am: 653e6947

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



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