Merge "Umbrella build targets to help engineers verify build"