add flavor support

Change-Id: I9dd49c4302c7b1a82a88f08e2d1b439bb26176bf