Merge "Check is-obj-large before is-obj-zygote-large"
am: e12575640d

Change-Id: Icc9101d473a911be25b07c1e842d59c232dc802c