am 2f8a04dc: am 9dfba720: Merge "ART: x86 indexOf intrinsics for the optimizing compiler"

* commit '2f8a04dca06c417c6c8cd4eb74025aba1d49020b':
  ART: x86 indexOf intrinsics for the optimizing compiler