Merge "SDK: Remove sources for jobb & manifmerge. They are in tools/base now."