Fix first build derp

This should make device fetching script work nicely
Merge remote-tracking branch 'paranoid/jellybean' into ds-kang