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

Change-Id: I21e5c969a206f4bb60e42cae535b34e3e5cdec1b