Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp