Merge changes from topic "libhidl-test-mapping"
am: 3e7c21d053

Change-Id: Ieb16458c276d17600847bd418e2d20e864ee489b