Un-branch master-dalvik from master