Merge "Do not remove init.recovery.*.rc in recovery root"
am: f184554771

Change-Id: I73f9681e2af81e2873cf732e2f47d8d547a87e87