Android O MR1 Preview 1
Merge "Add a variation in generate-package for future devboards" am: 81fa95978b am: 27de578142
am: f20027396e

Change-Id: I405136721526424646aeb880a41be0bf457df093