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

Change-Id: I12f3d94c13a2040e94c219b9a38fa651a4b980c9