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

Change-Id: I2a0776d045cca8967c29643b4d3b4507f88384a9