Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591 am: dd8b695c61 am: e9317d2d74

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1365586

Change-Id: I80fb7d3fc455966b64e0626f273ec0c60e279de1