Merge "Move recovery from /sbin to /system/bin"