am 52925af1: Merge "ART: refactor x86/x86-64 entrypoints"

* commit '52925af1e3136bcf68bc5754fbfa407950235217':
  ART: refactor x86/x86-64 entrypoints