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

Change-Id: Ifd61be9f108b4914de9bb2543e9d9bb486acf5de