Merge changes from topic "revert-3490488-KHHWJTNAXI" into main

* changes:
  Revert "Merge upstream tag 'v1.47.2' into aosp/main"
  Revert "Android: add new upstream source files"
  Revert "Android: define SIZEOF_TIME_T"
  Revert "Update generated files for Android"