Merge changes from topic 'hidl_gen_fix'
am: cbab402a94

Change-Id: Ib6f643b95701bb349b2a5dcce7b4ed8717b09ba8