Android port 1.10.7-23 update from Alessandro Pira