Merge "Moving recovery resources from /system to /vendor" am: 3903b26368 am: 1bf401d03f
am: c1eef556dc

Change-Id: Iba5ee12b8f4919ffebd88ae4999737cfa8033883