Android o preview 3
Merge "Add a variation in generate-package for future devboards"