Merge "ART: Remove old object_callbacks.h includes"
am: 349f900774

Change-Id: Id8f7ac09e081598a8b603f90c7bdb37652a62ebe