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