am 5cee3da1: am b2c1343d: Merge "Changes in some of the Android samples to support Google TV"

* commit '5cee3da1342301d1f3766a210416af4c510dd480':
  Changes in some of the Android samples to support Google TV