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

Change-Id: I374a2b26f4af22569632c0f9b4341989c097e7a4