Merge "HIDL Java getService now the same as C++."