Merge "Move recovery from /sbin to /system/bin" am: 4c80768796 am: ed2480be9b
am: dcc5fa4d4f

Change-Id: I8e38cceea21c232e325f6f55681846696718e68e