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

Change-Id: I817d73cbc67223ed7677a24d1d326b2e95743dcb