Merge changes from topic "hidl-soong-plugin" am: 0f2eb8b2ee am: afd7e4746c  -s ours
am: 7c2d2454de

Change-Id: Ib32217fc912c44d019a8498a96bcd58cdc6b351b