Fix build, RecoverySystem.

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