build: Add new public keys to recovery

Change-Id: I11dea464297813be36e60c23728dde8893535c46
build: Include an extra device.mk

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