revert these two repos back to aospa