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

* commit '81558dc34ace8b5d911f97a065c3089792eb99fc':
  Fix imgdiag build rules.