Merge "liboboe: add _STREAM_ to OBOE_STATE, general cleanup of comments"