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

Change-Id: I90db32ed6bf2f3cae57da6d43dded3ca7eef5ab7