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

Change-Id: I58257cf8a3f97ffec4cfef3a58ab8b87194295ea