Merge changes from topic 'hidl-dump-sys'
am: 83d5a82a5d

Change-Id: Id6eea87fd41a8a351a2346b0443f4e8d275ce970