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

Change-Id: I19674fab8a7f3cd9fe6472753ad8496359b6f948