Fix ccache mismerges

* ccache config has moved to a separate makefile in M

Change-Id: If1f426e647715f72c09f2339a61ac2a13121b477
2 files changed