Allow importing of settings into eclipse

Eclipse XML format seems to have changed. Importing silently failed before this fix.

Change-Id: I15d951a8fde5b57268da92b1351c2c7d8252b111
Merge remote-tracking branch 'cm/cm-11.0' into HEAD