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