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

Change-Id: I7a7ae9d03ad51248526f3e93884e99bf7bc9e0b5