Merge "Build: Replace system/lib with vendor/lib"