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

* commit '305e4b0a3dccb403afafc24d795d28321bc4936e':
  ART: Generic JNI for x86