am 053c1c5e: am 7fdeb1f9: merge in KQS81M

* commit '053c1c5e89136bd78c39c9e4a300d95f1cb3772d':
  Don't apply permission changes to symlink.
  recovery: fix use of init reboot method