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

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

Change-Id: Ia4b0829d0a921331444477e447ce9687d8a04dfb