Merge "services.core: remove use of -static hidl java"