Merge "Revert^2 "[CrashRecovery] Add module lib to Android SDK"" into main