Download j12 + clean up some pulls from MightyBear

Change-Id: I63c2d433eff2b78a2f145ed545153878728b3631