Two Android fixes: Renamed misnamed package, and fixed problem described in issue #3