Merge "Remove init_second_stage.recovery dep."
am: 6a581b7b66

Change-Id: I6228344ca707e3e782a2a26ccc4157804e4120a7