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

Change-Id: Ie05b980984e09ab691faa427a0eb04713c3c8e2d