Merge "Check for ANDROID_BUILD_TOP in rebuild.sh" into main