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

Change-Id: I9df76337027a3706adbbff38b70c0b3c653e240f