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

Change-Id: Ia87ef00c10528b161e36631726513d0b87845cc0