Merge "init: fix debuggable paths for recovery mode" am: fb9953e4d3 am: dc64a95871

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1634601

Change-Id: I7e3300093a9d4f54c4c622f11fded706e07982eb