Merge "Fix imgdiag build rules."