Merge "lshal --init-vintf: do not put empty <sepolicy> tag" am: 3cbc5893c6
am: 38de280b59

Change-Id: I6e3c69d8b00d224352c4a5a265fe2145e4395afc