Merge "Fix lshal --init-vintf may have empty <instance> tags." am: 4a9b7174ca am: 0a1b8a1128 am: bf578bcc61
am: 8dcba28620

Change-Id: Ie27d7767dde64a985bdd4d7083fcf6b37d95da1e