Merge "Correct inaccurate comments in build files"