Merge "Moving recovery resources from /system to /vendor"
am: 179a84b941

Change-Id: I5d709794527346b63e473da3cd3b17d31acb6bac