Merge "logd: add locks around ~SerializedFlushToState"