Remove flavor.mk am: 517399f444
am: bbc7bc06b1

Change-Id: I75aeaff1eb34d4be631b352cfc42ce8a02af3f67