Remove Apollo and add Eleven Back in

Also remove some Dalvik coding

Change-Id: I1f635ea0ea7aba3e8e2defef54636a72df21b93a