Updated to Android 5 and Scala 2.11