Merge "Revert "Update AndroidX from existing prebuilts"" into main