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