PZOSP Build Tags
Merge branch 'pzosp' of github.com:PZOSP/platform_build into pzosp