Merge "Update AndroidX from existing prebuilts" into main