Merge "services.core: remove use of -static hidl java" into stage-aosp-master