Remove flavor.mk am: 517399f444 am: bbc7bc06b1
am: ef0fd9905a

Change-Id: I64d22f8b0de6afef45506df7c2ff638714f73a84