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