Merge "logd: use ro.debuggable instead of ro.build.type"