tidying up step 4
Merge branch 'master' of https://github.com/pengying/androidtv-codelab