am d21197d5: Merge "Make libart the default runtime"

* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
  Make libart the default runtime