Merge "Fix imgdiag build rules."
am: 6247556fb9

* commit '6247556fb980c5122fc2dd5c431c2b2c0281606d':
  Fix imgdiag build rules.