revert to paranoid's build and core repos

Change-Id: I308508449b2640d3ed691e4db0c1ffc6bb40739a