Fork dalvik again, use CM's Gallery2 for now

* e2fsprogs for blkid to get correct partition type