Updated for 0.8, remove references to android-m3