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

Change-Id: Ibc160496a8d6bd6e498f8e0a0d42421e2dc9f076