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

Change-Id: Ie470be0e8039bfc08452bf4f8d6dd7e7abf694ef