Merge "Bump Java target from 1.7 to 1.8 in makefiles" into main am: bc32e2d8

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



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