Merge changes from topic 'fix-hidl-generate' into oc-dev
am: 4be51a8512  -s ours

Change-Id: I91054a4a0ffcf6ff117bd4b6c3dcc3a94e7231c2