Merge "Note confusion-causing breaks in HIDL convention." am: 27b09c2cd9
am: a8b9438aae

Change-Id: Ia6e5908a3ca6da4c487ef8f5d87d04804cb655b3