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

Change-Id: Ibf2e5b42970b3d5a55e021225cf47af0c1fd94e8