Merge "Make imgdiag more useful for dirty page in zygote"
am: fa177ff4ca

Change-Id: I81e5d94e4a59a7f562e19cf8ddb05873e986d390