Merge changes I953d774b,Id84c44bf

* changes:
  ART: Clean up allocator.h
  ART: Move CalleeSaveType to callee_save_type.h