Fix up libacdbloader's inclusion
spm: Disable retention on core 0

The newest RPM images _hate_ this, and there really is no reason
to enable it here just so it can be bypassed by the board file
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
ammend a new setting

Change-Id: I8d84939daaba318cd0dce6762109ab488d2597c1