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

Change-Id: I7a56d39f39a227fc748b182be4934b8082a60c31