am f6735280: resolved conflicts for merge of ac304133 to lmp-dev-plus-aosp

* commit 'f6735280cdb627985ec10a10391211aba7a67a57':
  ART: Fix memory unmapped twice issue in ElfFile::Load(bool)