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

Change-Id: Ib614570a0984e8efbe934f8de4790134d90f676e