Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 7ac34b86 am: e3a06785 Change-Id: Iab06f4c9a6f29b43f129557ef4bc7f8410350fef