am bd52a1e3: am e2c29f4a: Merge "ART: Use instrumented Alloc in Class-Linker"

* commit 'bd52a1e359be8cc1dce41c0b13e0d77124dc899c':
  ART: Use instrumented Alloc in Class-Linker