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

Change-Id: Icb130e02e5ec4d05af3ff5270efdb984af4613fd