Android: revert previous commit (Bug 4669)
(Refs #1)
4 files changed