Added Android CloudWatch sample.
Fix merge conflicts.