finishing codelab step 2
Merge branch 'master' of https://github.com/pengying/androidtv-codelab
minor fixes
Merge branch 'master' of https://github.com/pengying/androidtv-codelab