Merge changes Iff879def,I79c72346

* changes:
  Simply reboot if the boringssl self test fails
  init: reboot immediately if /data isn't mounted