Android: fix bad merge from previous commit
1 file changed