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

Change-Id: I287db1685c0ff95c8b9516b86014b7d05affb9a5