Refactor recovery build optiosn

Change-Id: I52e79da243f1b60181c166c0689bba7796741aa2