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

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