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

Change-Id: If341009ba5c22ec0e83170e856e83b23d8a925ce