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

Change-Id: Ic6eeff994ab0fb8e2e30dd7c200d9eab512cf057