Android l-preview release 2
Merge "Switch from core to core-libart"