clean up some warnings when building recovery

Change-Id: I1541534ee6978ddf8d548433986679ce9507d508
10 files changed