Merge "services.core: remove use of -static hidl java" into stage-aosp-master am: e79a0931f7
am: 9bd5b76318  -s ours

Change-Id: Ibaca955ef655e2b00ca96cc5c3a7de4eb21d3538