Merge "Add imgdiag support for diff against zygote"