Remove flavor.mk
am: 517399f444

Change-Id: I738fa1ca91d46f4459ef45ff629a9c713922fa0a