Merge "lshal: --init-vintf exclude system hals" am: 8db626d2f3 am: 34206360f2
am: d1b6b40adb

Change-Id: Ie2d28a374a3fb18d969783394b80b3a0d6fe0869