Merge "ART: Use the right ElfBuilder for oatdump symbolizer" am: 2f6ad55a3b
am: 6e1564cfdf

* commit '6e1564cfdf4f6b332ee6d156de6ff9712655fff6':
  ART: Use the right ElfBuilder for oatdump symbolizer