Android: Fix ambiguous overloaded fuction call error after rebase