Merge "Moving recovery resources from /system to /vendor" am: 2d7de3d682 am: 519e85b5f3
am: d4eaa4a174

Change-Id: Ic57684498068179d15291768b725ca66b1efa614