Merge changes from topic "hidl-soong-plugin"
am: 0f2eb8b2ee

Change-Id: I4315fecb7466a4432e4f90f66c1ac6ef6e9d43e4