vendor: Cleanup

Change-Id: Ice8c8207726256d1e259f8ade85a5a4e58d98a42
Merge "vendor: Cleanup" into kk_mkt