Merge "Move //lib/DEFS to //tools/DEFS"