Merge "init: reboot to bootloader on crash for development builds" am: ac8a3bd283 am: f0cb60083e
am: 2b3d157af5

Change-Id: If1dd58050d5dce62df33d5527c5be2739600bb74