Merge "Fix java-client generation of HIDL code"
am: f07e51ddae

Change-Id: I4f5d07866d6c3936ff5e5c907e1f9478dc67f2d2