Merge "vold: restore -D__ANDROID_DEBUGGABLE__"