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

Change-Id: I80906c8f1e020e5a94d363ec6e4371d8e28a2c0a