Merge changes from topic "lshal_init_vintf_type" am: 73c392450d am: e1f7a97f0c
am: 60752b9be1

Change-Id: I687e7c418e39fd186c31d829aaaf28c0e47ce04c