lexikon: revert to old vendor tree format

Change-Id: Ic36ceda8ad2fc669056c48ad84eb68482dc40350
Merge "lexikon: revert to old vendor tree format" into jellybean