Revert "Add internal AOSPX version - iceandfire"

This reverts commit 6ad200b9a759b4f2ade8b4a734830a54caadc456.