defconfigs update

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