Merge "HIDL: C++ Java parity" into oc-dev
am: 579110398d  -s ours

Change-Id: I60e19c0d9328bea5e69517e91b47a56e53758ad1