Cleaned android branch