base: Remove duplicated key handling

Change-Id: Ifd8ecac2b3758f0c6a4dbaa39350831af0b145a0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge "base: Remove duplicated key handling" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0