Merge "Remove samples for deprecated Android Beam API"