am 01b18562: am 305e4b0a: Merge "ART: Generic JNI for x86"

* commit '01b18562baec0080569e33333c45569a5b0e4006':
  ART: Generic JNI for x86