Revert "Temporarily track aosp"

This reverts commit 7b33e795ac1cfefc062e719d406790cb4427b4f7.