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

Change-Id: I896e63e4ed726a7c04149b858c5e33032a574093