Merge "lshal: explain VINTF 'X' value in help" am: faefe359e4 am: bc811faf3e am: eb8be2724d
am: f80640799a

Change-Id: Ie2a1c41cf24fb7866ca0f86173f9304eeea02ecc