Merge "HIDL: C++ Java parity"