Merge "Moving recovery resources from /system to /vendor" am: 179a84b941 am: 26ed6c7d42
am: 61af327e92

Change-Id: Ia979fe2f128ab40743c66f3ae81aee9c04f38757