Removing legacy Makefile for bug 1295312

Change-Id: I11cb4c610f96440e45c5558384e5444ae22d9edd
Merge "Removing legacy Makefile for bug 1295312"