build: Add new public keys to recovery

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