Android port 1.10.7-20 update from Alessandro Pira