Merge "ART: Add allocation callback" am: f24ddb28eb
am: de967edf69

Change-Id: I158b0aec095950f4f4655b1b0a11791155bcb9b6