Merge "atv-sdk: use google as brand instead of generic_x86" into oc-dev
Bo Hu [Thu, 18 May 2017 14:06:10 +0000 (14:06 +0000)]

Trivial merge