Add drawengine and javamail-android
Cleanup drawengine and javamail-android