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

Change-Id: I104760c6893cd220b97a93b925b95e902cad4b37