Add oreo and nougat flavours for maintaining different source for various parts