Merge "Update Android section of roadmap."