Fix merge errors on Android implementation