am 33210ec1: Merge "change android beam sample name" into ics-mr0

* commit '33210ec1f5c8364c4865c718f4d0de00e28b5774':
  change android beam sample name