Revert "(Android) Build fix"

This reverts commit f7c2332c0d152e8582a2f4c01b5920e6fe095f7a.