Merge "Fix lshal --init-vintf may have empty <instance> tags." into oc-dev am: 8d320dfc21
am: 0ec25acc1d

Change-Id: Ifc8e381a4c57f560031f412d9a89f68c19a1f08a