Deal with CM's irritating need to fetch prebuilts

This only matters if building the whole rom.
Whoops, fix out of place branch.