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

Change-Id: Ib7a57df3495794e10a33619ddae864ca49dc37f7