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

Change-Id: I5f678c629e73d4ed281990a620e2c92464d79259