Merge "HIDL: C++ Java parity" into oc-dev