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

Change-Id: I7ac1d39d4222a89d5de6ce6510c43d0814bd0abb