6b16d37d65
removing the backward compatability file and making sure to use the right paths Change-Id: I518d52c82e0c5878bd334713e7b1758bba79762d