Use "include" instead of "-include" wherever appropriate

* When using "-include", make ignores a makefile which does not
  exist, with no error message.
* Use "include" for all makefiles which are essential for a
  working build.

Change-Id: Ic00ba2e9246da3ec47102f79b9c2725ed155b4cf
(cherry picked from commit 82d76f7f9e370de2651dbcb3082d3562f6562c81)
Merge remote-tracking branch 'cm/cm-11.0' into HEAD