Android 5.1.1 release 37
Merge "Switch from core to core-libart"