Merge "services.core: remove use of -static hidl java"
am: e1b407d62e  -s ours

Change-Id: I2780994a3fd64460f34fb8af34efa13cb36449ce