Merge "Modify full_mips-eng build in line with the full-eng build"