Merge "ART: Remove old object_callbacks.h includes" am: 349f900774 am: 5f111ebc90 am: f0a8161ee3
am: f81284a392

Change-Id: I568ab989b3d93de42811069a1b9973afb7499652