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

Change-Id: Ida67e23535fbccd1894af0ce83864a5483effac6