Merge "Move recovery to /system/bin" am: 0937a84521
am: 3051d54902

Change-Id: I88c886ac92e33769c71c54044c17dfc8e3e12752