Track my own espmartin/dalvik (wip branch)