fix recovery build for cwm

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