Merge "atv-sdk: use google as brand instead of generic_x86" into oc-dev