Merge "Merge "Reland "services.core: remove use of -static hidl java"" into...
Merge "Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 9f11a24d" into oc-mr1-dev-plus-aosp
am: b32d55c6
Change-Id: I2824b5a2df1852e7dc8e1e591e4447ccf49e7d73