Android 5.0.0 release 4
am 1a848650: am 8f312e0c: Merge "Switch from core to core-libart"

* commit '1a8486507e3feb42078ca2581404700a65110f0a':
  Switch from core to core-libart