Fix first build derp

This should make device fetching script work nicely
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/manifest into jellybean