[Android] Compatibility and loading issues with S7 and S8 devices

Follow