Merge changes from topic "lshal_init_vintf_type"
am: 73c392450d

Change-Id: Ifdb50709f10aba292682cab120a5b691942c0d03