Merge "HIDL: C++ Java parity"
am: 475d9b283c

Change-Id: I8195a0a4de291f26c637f5cd6802d6bbaf0d17a3