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

Change-Id: I007fb20df553c2cec9d9e88a9ae79a4f523acfc6