Merge "Moving recovery resources from /system to /vendor" am: ac6672d49f am: f8f67de2ae
am: fa44992325

Change-Id: I8d87d8ca9a70c8a616f09177e81d8730e18b80d0