Merge "Moving recovery resources from /system to /vendor"