Fix local vendor folder

Change-Id: Id572535f0013b7bc67406de37e453b1926d13a6c
Track local vendor again

Change-Id: I495a0996a8fef331ec9234b2ce06c7fde742ee48
Merge branch 'lp5.0' of https://github.com/AICP/device_lge_hammerhead into lollipop