Merge "ART: Add allocation callback"
am: f24ddb28eb

Change-Id: I1f565590fc884312c40b279ac9ea8d0798d2f396