Merge "Remove AndroidBeamDemo from samples"