Merge "Make imgdiag diff against app vs zygote heap"