am 06689dc5: Merge "Fix recovery image build."

* commit '06689dc53d14ab0449c64c097d2937179f986873':
  Fix recovery image build.