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

Change-Id: Ibd8a725435109284b83f3ba3dd22e16f2f949c4d