Merge "change android beam sample name" into ics-mr0