Merge "services.core: remove use of -static hidl java" am: e1b407d62e  -s ours am: 935136689d  -s ours am: 0d731c79e3  -s ours
am: 1fe002f6c4  -s ours

Change-Id: Ie135996b539996c27f5c1bddb7981ab194367a73