Android platform tools & better grep detection.