Merge "HIDL Java: DeadObjectException"