Merge "Silence some external/jhead warnings."
am: c2702fcd38

* commit 'c2702fcd385410b17a0448cbf047ae6d2b75e892':
  Silence some external/jhead warnings.