Revert "Internal AOSPX version from TeamHorizon"

This reverts commit 1f67149cfa93c5637e895a0b5a7e66c006c024e6.