metadata update
Merge branch 'master' of https://github.com/pengying/androidtv-codelab
updating 4
Updating 4
minor udpates