Merge "adding Android Beam sample"