Merge "logd: enable CFI"