Bug 939611 - Build storage/src in unified mode; r=asuth
Backed out changeset c848ede03acc (bug 938950) for build bustage