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