Revert "All aosp for this branch"

This reverts commit d0ce742ea4fc0cb89aa24d662856696ddf8fd3f8.