flavor_ref -> flavor_id

Change-Id: I3578f906ddec69b062d18c9d37a8b764df067602
Closes-Bug: 1392573
Merge "flavor_ref -> flavor_id"