Merge "Make imgdiag diff against app vs zygote heap"
am: 9710fbaea9

Change-Id: Ibd439bef633ef086f67c5acd035cfad9ac3bb06a