Changed Dalvik to one Branch for all

Also we now use a fork of chads dalvik version